Explicitly use GNU msgfmt on non-GNU systems.

Signed-off-by: John Levon <john.levon@sun.com>

diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index 2b767517b8201b2596e2293abc4d743faa64bfc4..32a37b44fa9c7548ac6191680843f9c080e8f1dc 100644 (file)
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -9,6 +9,8 @@ STRIP      = $(CROSS_COMPILE)strip
 OBJCOPY    = $(CROSS_COMPILE)objcopy
 OBJDUMP    = $(CROSS_COMPILE)objdump
 
+MSGFMT     = msgfmt
+
 INSTALL      = install
 INSTALL_DIR  = $(INSTALL) -d -m0755
 INSTALL_DATA = $(INSTALL) -m0644

diff --git a/config/SunOS.mk b/config/SunOS.mk
index 5d548054d30860291c77235460d364ed7d8ca961..77e4b2482565bad3cd3b39f45905086faa344a7b 100644 (file)
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -9,6 +9,8 @@ STRIP      = $(CROSS_COMPILE)gstrip
 OBJCOPY    = $(CROSS_COMPILE)gobjcopy
 OBJDUMP    = $(CROSS_COMPILE)gobjdump
 
+MSGFMT     = gmsgfmt
+
 SHELL      = bash
 
 INSTALL      = ginstall

diff --git a/tools/python/Makefile b/tools/python/Makefile
index 1c3a6c4ffcd0532580fda56aea36abba6711b206..085ac84b5a3c0b6d1e0247080062e93cdba0473a 100644 (file)
--- a/tools/python/Makefile
+++ b/tools/python/Makefile
@@ -7,12 +7,12 @@ all: build
 .PHONY: build
 build:
        CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py build
-       if which msgfmt >/dev/null ; then \
+       if which $(MSGFMT) >/dev/null ; then \
           for file in `cd xen/xm; find messages -name xen-xm.po`; do \
             dest=`echo "build/$$file" | \
                   sed -e 's#xen-xm.po#LC_MESSAGES/xen-xm.mo#'`; \
             mkdir -p `dirname "$$dest"`; \
-            msgfmt -c -o "$$dest" "xen/xm/$$file"; \
+            $(MSGFMT) -c -o "$$dest" "xen/xm/$$file"; \
           done; \
         fi
 
@@ -26,7 +26,7 @@ install: install-messages
 endif
 
 install-messages: all
-       if which msgfmt >/dev/null ; then \
+       if which $(MSGFMT) >/dev/null ; then \
          mkdir -p "$(DESTDIR)/usr/share/locale"; \
          cp -R build/messages/* "$(DESTDIR)/usr/share/locale/"; \
        fi